Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DATAVIZ: Merge upstream 4.0.3 #4

Merged
merged 215 commits into from
Nov 15, 2023
Merged

DATAVIZ: Merge upstream 4.0.3 #4

merged 215 commits into from
Nov 15, 2023

Conversation

Kaapp
Copy link

@Kaapp Kaapp commented Nov 15, 2023

This should have kept our changes, commits to modules/tiles/* are still in history. This also includes a fix to one of the issues I found with 3d-tiles implicit parsing, but doesn't look like it would fix the other so I will raise another PR after with that

git remote add upstream git@github.com:visgl/loaders.gl.git
git fetch upstream
git merge --no-ff v4.0.3
# fixed merge conflicts, basically just package.json
yarn install
yarn build
git commit # although did this via Github Desktop
git push -u origin merge-4.0.3-master

belom88 and others added 30 commits July 13, 2023 17:14
* fix(obj) parse vertex colors

* v3.4.9 changelog
@Kaapp Kaapp self-assigned this Nov 15, 2023
Copy link
Member

@Rennzie Rennzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you do your fix in a different PR given it's unrelated to to upstream syncing?

@coveralls
Copy link

Pull Request Test Coverage Report for Build 6878254529

  • 11355 of 18095 (62.75%) changed or added relevant lines in 520 files are covered.
  • 9682 unchanged lines in 385 files lost coverage.
  • Overall coverage increased (+9.2%) to 67.389%

Changes Missing Coverage Covered Lines Changed/Added Lines %
modules/3d-tiles/src/lib/parsers/parse-3d-tile-gltf.ts 11 12 91.67%
modules/arrow/src/geoarrow/convert-geoarrow-to-binary-geometry.ts 261 262 99.62%
modules/arrow/src/tables/convert-table-to-arrow.ts 0 1 0.0%
modules/bson/src/bson-loader.ts 5 6 83.33%
modules/core/src/lib/api/encode-table.ts 12 13 92.31%
modules/core/src/lib/api/parse.ts 41 42 97.62%
modules/core/src/lib/fetch/read-array-buffer.ts 2 3 66.67%
modules/core/src/lib/loader-utils/get-data.ts 3 4 75.0%
modules/core/src/lib/utils/response-utils.ts 11 12 91.67%
modules/crypto/src/lib/algorithms/md5-wasm.ts 6 7 85.71%
Files with Coverage Reduction New Missed Lines %
modules/3d-tiles/src/lib/parsers/helpers/parse-utils.ts 1 84.38%
modules/3d-tiles/src/lib/parsers/parse-3d-tile-gltf.ts 1 93.02%
modules/3d-tiles/src/lib/parsers/parse-3d-tile.ts 1 95.08%
modules/arrow/src/arrow-writer.ts 1 94.59%
modules/arrow/src/lib/parse-arrow-sync.ts 1 88.37%
modules/bson/src/bson-writer.ts 1 87.5%
modules/core/src/iterators/make-iterator/make-iterator.ts 1 95.0%
modules/core/src/lib/api/parse-in-batches.ts 1 93.28%
modules/core/src/lib/api/register-loaders.ts 1 94.0%
modules/core/src/lib/loader-utils/get-fetch-function.ts 1 93.88%
Totals Coverage Status
Change from base Build 6616027796: 9.2%
Covered Lines: 68494
Relevant Lines: 102863

💛 - Coveralls

@Kaapp
Copy link
Author

Kaapp commented Nov 15, 2023

Sorry poor wording @Rennzie, this doesn't include my fix or any changes from me - there's an upstream fix for one issue I found

@Rennzie
Copy link
Member

Rennzie commented Nov 15, 2023

Sorry poor wording @Rennzie, this doesn't include my fix or any changes from me - there's an upstream fix for one issue I found

Ah ok. Fair dues.

@Rennzie Rennzie self-requested a review November 15, 2023 14:21
@Kaapp Kaapp merged commit 67d30fd into master Nov 15, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.